Only start sliding when using the new API.

Sun Feb  1 16:34:07 2004  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Only start
	sliding when using the new API.

diff --git a/ChangeLog b/ChangeLog
index 581635d56e48b9e93238ff236bafeafcdc447522..798a324abe7583b54fff0b490c511195511cb5c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb  1 16:34:07 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Only start
+       sliding when using the new API.
+
 Sun Feb  1 16:03:39 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 581635d56e48b9e93238ff236bafeafcdc447522..798a324abe7583b54fff0b490c511195511cb5c3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Feb  1 16:34:07 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Only start
+       sliding when using the new API.
+
 Sun Feb  1 16:03:39 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 581635d56e48b9e93238ff236bafeafcdc447522..798a324abe7583b54fff0b490c511195511cb5c3 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Feb  1 16:34:07 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Only start
+       sliding when using the new API.
+
 Sun Feb  1 16:03:39 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 581635d56e48b9e93238ff236bafeafcdc447522..798a324abe7583b54fff0b490c511195511cb5c3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Feb  1 16:34:07 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Only start
+       sliding when using the new API.
+
 Sun Feb  1 16:03:39 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 581635d56e48b9e93238ff236bafeafcdc447522..798a324abe7583b54fff0b490c511195511cb5c3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Feb  1 16:34:07 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Only start
+       sliding when using the new API.
+
 Sun Feb  1 16:03:39 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 94524f7519d2239a198cfb03cab2777230b951ea..224cb361de30c474ada6f82db4dd94c288b2dc97 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -1513,7 +1513,7 @@ gtk_toolbar_size_allocate (GtkWidget     *widget,
          new_states[i] != NORMAL)
        {
          /* an item disappeared, begin sliding */
-         if (!size_changed)
+         if (!size_changed && priv->api_mode == NEW_API)
            gtk_toolbar_begin_sliding (toolbar);
        }
     }